Skip to content

Merge to master branch #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jackylai0 wants to merge 33 commits into
base: master
Choose a base branch
from
Open

Merge to master branch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3988333
Modified to allow building with VC2010
jackylai0 May 16, 2016
82b0fdc
Update MinHook to v1.3.2.1
jackylai0 May 17, 2016
ae47fe9
Fix last incomplete commit
jackylai0 May 18, 2016
7ee0cf9
Use HeapAlloc() directly to avoid malloc()/operator new() in profiling
jackylai0 May 18, 2016
b71bb1b
Preserve last error code from malloc() or free()
jackylai0 May 18, 2016
4358544
Use TLS functions instead of thread local variable since it is not al…
jackylai0 May 18, 2016
066de5a
Delay injection until process entry point reached
jackylai0 May 21, 2016
96aec30
Need to allocate one more byte for dllpath string
jackylai0 May 21, 2016
aaca4b0
Fix command line handling and allow space in injection target path
jackylai0 May 21, 2016
8b06441
Avoid printf and write injection log to file
jackylai0 May 21, 2016
ea29b79
Hook also realloc and calloc
jackylai0 May 21, 2016
3628280
Re-enable msvcrt hooking
jackylai0 May 21, 2016
5904eb6
Update documentation
jackylai0 May 21, 2016
c08ca0f
Use separate MinHook project file to allow updating MinHook independe…
jackylai0 May 22, 2016
6ff1ff4
Enable capturing backtrace on WinXP
jackylai0 May 22, 2016
d07a8de
Fix tracing of realloc special cases
jackylai0 May 22, 2016
9bfcce0
Quote path to support paths with whitespace
jackylai0 Nov 6, 2018
189ae12
Explicity state link library dependency
jackylai0 Nov 6, 2018
fbe8895
Merge with upstream https://github.com/lukedodd/Heapy tag Heap-0_2
jackylai0 Nov 6, 2018
ffe198f
Merge remote-tracking branch 'jackylai0/master'
Mar 26, 2020
118ea91
Proper command line argument escaping
Mar 26, 2020
f52fcf0
Use critical sections rather than mutexes internally (faster)
Mar 26, 2020
6267e0e
Update to VS2019
Mar 26, 2020
1cef347
Ready to profile number of allocations.
Mar 27, 2020
d48e7b0
Fix hooking calloc
jackylai0 Apr 8, 2020
d67e9f0
Change profile depth count to intptr_t to avoid compile warning
jackylai0 Apr 8, 2020
a5c2f9c
Print stack trace without hook function in both Release and Debug build.
jackylai0 Apr 8, 2020
2977b58
Simplify HeapAllocator
jackylai0 Apr 11, 2020
8542f74
Update HeapAllocator to C++11
jackylai0 Apr 11, 2020
32bce53
Fix realloc tracing
jackylai0 Apr 18, 2020
2e2a231
Enhance test
jackylai0 Apr 18, 2020
89e221c
Merge branch 'merge_jackylais_work' of https://github.com/lukedodd/Heapy
jackylai0 Apr 18, 2020
3c77b6f
Upgrade LoadLibraryInjection to handle wstrings
jackylai0 Apr 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion COPYING.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ The MinHook library is used in this project.

All MinHook files are under libs/MinHook.

The license for MinHook is at libs/MinHook/Copying.txt.
The license for MinHook is at libs/MinHook/LICENSE.txt.
2 changes: 1 addition & 1 deletion CreateRelease/CreateRelease.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat"
call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"
devenv ..\Heapy.sln /Rebuild "Release|Win32"
devenv ..\Heapy.sln /Rebuild "Release|x64"

Expand Down
49 changes: 15 additions & 34 deletions Heapy.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Heapy", "Heapy\Heapy.vcxproj", "{964F661B-8FA0-4DEF-836F-0D0720972D02}"
ProjectSection(ProjectDependencies) = postProject
{F3C8DD27-15AB-4B73-A499-C32181ACACC9} = {F3C8DD27-15AB-4B73-A499-C32181ACACC9}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HeapyInject", "HeapyInject\HeapyInject.vcxproj", "{F3C8DD27-15AB-4B73-A499-C32181ACACC9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libMinHook", "libs\MinHook\build\libMinHook.vcxproj", "{65021938-D251-46FA-BC3D-85C385D4C06D}"
ProjectSection(ProjectDependencies) = postProject
{529CF76D-94CA-4127-96F2-0EEB77A9DB19} = {529CF76D-94CA-4127-96F2-0EEB77A9DB19}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApplication", "TestApplication\TestApplication.vcxproj", "{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}"
EndProject
Expand All @@ -18,72 +19,52 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProfileTestApplication", "P
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D} = {2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libMinHook", "libMinHook\libMinHook.vcxproj", "{529CF76D-94CA-4127-96F2-0EEB77A9DB19}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Debug|Mixed Platforms.Build.0 = Debug|x64
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Debug|Win32.ActiveCfg = Debug|Win32
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Debug|Win32.Build.0 = Debug|Win32
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Debug|x64.ActiveCfg = Debug|x64
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Debug|x64.Build.0 = Debug|x64
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Release|Mixed Platforms.Build.0 = Release|Win32
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Release|Win32.ActiveCfg = Release|Win32
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Release|Win32.Build.0 = Release|Win32
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Release|x64.ActiveCfg = Release|x64
{964F661B-8FA0-4DEF-836F-0D0720972D02}.Release|x64.Build.0 = Release|x64
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Debug|Mixed Platforms.Build.0 = Debug|x64
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Debug|Win32.ActiveCfg = Debug|Win32
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Debug|Win32.Build.0 = Debug|Win32
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Debug|x64.ActiveCfg = Debug|x64
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Debug|x64.Build.0 = Debug|x64
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Release|Mixed Platforms.Build.0 = Release|Win32
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Release|Win32.ActiveCfg = Release|Win32
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Release|Win32.Build.0 = Release|Win32
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Release|x64.ActiveCfg = Release|x64
{F3C8DD27-15AB-4B73-A499-C32181ACACC9}.Release|x64.Build.0 = Release|x64
{65021938-D251-46FA-BC3D-85C385D4C06D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{65021938-D251-46FA-BC3D-85C385D4C06D}.Debug|Mixed Platforms.Build.0 = Debug|x64
{65021938-D251-46FA-BC3D-85C385D4C06D}.Debug|Win32.ActiveCfg = Debug|Win32
{65021938-D251-46FA-BC3D-85C385D4C06D}.Debug|Win32.Build.0 = Debug|Win32
{65021938-D251-46FA-BC3D-85C385D4C06D}.Debug|x64.ActiveCfg = Debug|x64
{65021938-D251-46FA-BC3D-85C385D4C06D}.Debug|x64.Build.0 = Debug|x64
{65021938-D251-46FA-BC3D-85C385D4C06D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{65021938-D251-46FA-BC3D-85C385D4C06D}.Release|Mixed Platforms.Build.0 = Release|Win32
{65021938-D251-46FA-BC3D-85C385D4C06D}.Release|Win32.ActiveCfg = Release|Win32
{65021938-D251-46FA-BC3D-85C385D4C06D}.Release|Win32.Build.0 = Release|Win32
{65021938-D251-46FA-BC3D-85C385D4C06D}.Release|x64.ActiveCfg = Release|x64
{65021938-D251-46FA-BC3D-85C385D4C06D}.Release|x64.Build.0 = Release|x64
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Debug|Win32.ActiveCfg = Debug|Win32
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Debug|Win32.Build.0 = Debug|Win32
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Debug|x64.ActiveCfg = Debug|x64
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Debug|x64.Build.0 = Debug|x64
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Release|Mixed Platforms.Build.0 = Release|Win32
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Release|Win32.ActiveCfg = Release|Win32
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Release|Win32.Build.0 = Release|Win32
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Release|x64.ActiveCfg = Release|x64
{2CDA5A6B-3B49-40CC-AC3F-819167EE2C9D}.Release|x64.Build.0 = Release|x64
{00772643-280F-44BE-8839-14E06137A705}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{00772643-280F-44BE-8839-14E06137A705}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{00772643-280F-44BE-8839-14E06137A705}.Debug|Win32.ActiveCfg = Debug|Win32
{00772643-280F-44BE-8839-14E06137A705}.Debug|x64.ActiveCfg = Debug|x64
{00772643-280F-44BE-8839-14E06137A705}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{00772643-280F-44BE-8839-14E06137A705}.Release|Mixed Platforms.Build.0 = Release|Win32
{00772643-280F-44BE-8839-14E06137A705}.Release|Win32.ActiveCfg = Release|Win32
{00772643-280F-44BE-8839-14E06137A705}.Release|x64.ActiveCfg = Release|x64
{529CF76D-94CA-4127-96F2-0EEB77A9DB19}.Debug|Win32.ActiveCfg = Debug|Win32
{529CF76D-94CA-4127-96F2-0EEB77A9DB19}.Debug|Win32.Build.0 = Debug|Win32
{529CF76D-94CA-4127-96F2-0EEB77A9DB19}.Debug|x64.ActiveCfg = Debug|x64
{529CF76D-94CA-4127-96F2-0EEB77A9DB19}.Debug|x64.Build.0 = Debug|x64
{529CF76D-94CA-4127-96F2-0EEB77A9DB19}.Release|Win32.ActiveCfg = Release|Win32
{529CF76D-94CA-4127-96F2-0EEB77A9DB19}.Release|Win32.Build.0 = Release|Win32
{529CF76D-94CA-4127-96F2-0EEB77A9DB19}.Release|x64.ActiveCfg = Release|x64
{529CF76D-94CA-4127-96F2-0EEB77A9DB19}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading