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

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

Merge to master branch #2

jackylai0 wants to merge 33 commits into from

Conversation

@jackylai0
Copy link

@jackylai0 jackylai0 commented Jan 21, 2017

Fix:

  • Use only Windows API for dll injection and profiling
  • Preserve last error code from original malloc / free
  • Delay injection until process entry point is reached
  • Hook realloc and calloc for profiling
  • Allow space in injection dll's path
  • Allocate enough buffer in injected process for dll path
    New:
  • Support Visual C++ 2010 or later
  • Support running on Windows XP
  • Update MinHook library
  • Enable hooking of msvcrt.dll's malloc and free
  • Write injection log to InjectLog.txt

jackylai0 and others added 20 commits May 16, 2016 23:46
@jackylai0
Modified to allow building with VC2010
3988333
@jackylai0
Update MinHook to v1.3.2.1
82b0fdc
@jackylai0
Fix last incomplete commit
ae47fe9
@jackylai0
Use HeapAlloc() directly to avoid malloc()/operator new() in profiling
7ee0cf9
@jackylai0
Preserve last error code from malloc() or free()
b71bb1b
@jackylai0
Use TLS functions instead of thread local variable since it is not al…
4358544 
…lowed

to use thread local before CRT initialization
@jackylai0
Delay injection until process entry point reached
066de5a 
SuspendThread is not enough to guarantee safe initialization of
bookkeeping data
@jackylai0
Need to allocate one more byte for dllpath string
96aec30
@jackylai0
Fix command line handling and allow space in injection target path
aaca4b0
@jackylai0
Avoid printf and write injection log to file
8b06441
@jackylai0
Hook also realloc and calloc
ea29b79
@jackylai0
Re-enable msvcrt hooking
3628280
@jackylai0
Update documentation
5904eb6
@jackylai0
Use separate MinHook project file to allow updating MinHook independe…
c08ca0f 
…ntly.

Remove the need to manually update MinHook project when upgrading Visual C++.
@jackylai0
Enable capturing backtrace on WinXP
6ff1ff4
@jackylai0
Fix tracing of realloc special cases
d07a8de
@jackylai0
Quote path to support paths with whitespace
9bfcce0
@jackylai0
Explicity state link library dependency
189ae12
@jackylai0
Merge with upstream https://github.com/lukedodd/Heapy tag Heap-0_2
fbe8895
Merge remote-tracking branch 'jackylai0/master'
ffe198f 
I decided to ditch the changes to make the profiler not use malloc for now. They didn't compile.

I'll resurrect these after assesing whether some third party hash table would do the job better.

# Conflicts:
#	Heapy/Heapy.vcxproj
#	HeapyInject/HeapyInject.vcxproj
#	ProfileTestApplication/ProfileTestApplication.vcxproj
#	Readme.md
#	TestApplication/TestApplication.vcxproj
#	libs/MinHook/build/VC12/libMinHook.vcxproj
#	libs/MinHook/src/HDE/hde32.h
#	libs/MinHook/src/HDE/hde64.h
#	libs/MinHook/src/hook.cpp
#	libs/MinHook/src/trampoline.cpp
@lukedodd
Copy link
Owner

lukedodd commented Mar 26, 2020

I honestly can't remember what happened with this line of work - but I'm looking at incorporating these changes now @jackylai0. I'm planning on adding some other features soon and wanted a good starting point. Branch merge_jackylais_work.

@jackylai0
Copy link
Author

jackylai0 commented Mar 29, 2020 •
edited
Loading

"I decided to ditch the changes to make the profiler not use malloc for now. They didn't compile."

@lukedodd You mean HeapAllocator? It is based on VS2010 std::allocator and modify to use HeapAlloc/HeapFree instead. Maybe std::allocator changes is too extensive and have to re-adapted for VS2019.

@jackylai0
Copy link
Author

jackylai0 commented Apr 18, 2020

@lukedodd Please check my latest commits. I merged your branch again and fixed various bugs (including HeapAllocator compile error).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jackylai0 @lukedodd