Auto load module for MH_CreateHookApi

2 files changed, 10 insertions, 3 deletions

diff --git a/include/MinHook.h b/include/MinHook.h
index aa6763b..f389d0f 100644
--- a/include/MinHook.h
+++ b/include/MinHook.h
@@ -121,8 +121,9 @@ 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);
+        LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal, bool autoLoad = false);
 
     // Removes an already created hook.
     // Parameters:
diff --git a/src/hook.c b/src/hook.c
index a7fd374..4ee7c3a 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -852,13 +852,19 @@ MH_STATUS WINAPI MH_ApplyQueued(VOID)
 
 //-------------------------------------------------------------------------
 MH_STATUS WINAPI MH_CreateHookApi(
-    LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal)
+    LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal, bool autoLoad)
 {
     HMODULE hModule;
     LPVOID  pTarget;
 
     hModule = GetModuleHandleW(pszModule);
-    if (hModule == NULL)
+    if (hModule == NULL && autoLoad)
+    {
+        hModule = LoadLibraryW(pszModule);
+        if (hModule == NULL)
+            return MH_ERROR_MODULE_NOT_FOUND;
+    }
+    else
         return MH_ERROR_MODULE_NOT_FOUND;
 
     pTarget = (LPVOID)GetProcAddress(hModule, pszProcName);