Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/minhook.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTsuda Kageyu <tsuda.kageyu@gmail.com>2015-05-25 10:36:22 +0300
committerTsuda Kageyu <tsuda.kageyu@gmail.com>2015-05-25 10:36:22 +0300
commit68e11d9e925d37ef8638c69af90e498a5224abaf (patch)
tree310cfb118ceeb5b3c940255e726f63fc61760d07
parent0b51a8f4ffdd304148b96f2a445b03e9675d1d14 (diff)
Revert "Auto load module for MH_CreateHookApi"
This reverts commit 20922427295daf22b0ce798dcd891738c6e319cc.
-rw-r--r--include/MinHook.h3
-rw-r--r--src/hook.c10
2 files changed, 3 insertions, 10 deletions
diff --git a/include/MinHook.h b/include/MinHook.h
index f389d0f..aa6763b 100644
--- a/include/MinHook.h
+++ b/include/MinHook.h
@@ -121,9 +121,8 @@ extern "C" {
// ppOriginal [out] A pointer to the trampoline function, which will be
// used to call the original target function.
// This parameter can be NULL.
- // autoLoad [in] Will load module if not loaded
MH_STATUS WINAPI MH_CreateHookApi(
- LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal, bool autoLoad = false);
+ LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal);
// Removes an already created hook.
// Parameters:
diff --git a/src/hook.c b/src/hook.c
index 4ee7c3a..a7fd374 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -852,19 +852,13 @@ MH_STATUS WINAPI MH_ApplyQueued(VOID)
//-------------------------------------------------------------------------
MH_STATUS WINAPI MH_CreateHookApi(
- LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal, bool autoLoad)
+ LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal)
{
HMODULE hModule;
LPVOID pTarget;
hModule = GetModuleHandleW(pszModule);
- if (hModule == NULL && autoLoad)
- {
- hModule = LoadLibraryW(pszModule);
- if (hModule == NULL)
- return MH_ERROR_MODULE_NOT_FOUND;
- }
- else
+ if (hModule == NULL)
return MH_ERROR_MODULE_NOT_FOUND;
pTarget = (LPVOID)GetProcAddress(hModule, pszProcName);