Fixup for Switch MHook to MinHook commit.

I mixed commits during rebase and pushed one without hooks enabled.

Adds missing changes in 323a2acca3964baa486940338bb5c11c8938958f

Fixes #6070

2 files changed, 7 insertions, 5 deletions

diff --git a/src/mpc-hc/FakeFilterMapper2.cpp b/src/mpc-hc/FakeFilterMapper2.cpp
index b308dbc0a..f2065a398 100644
--- a/src/mpc-hc/FakeFilterMapper2.cpp
+++ b/src/mpc-hc/FakeFilterMapper2.cpp
@@ -1,6 +1,6 @@
 /*

  * (C) 2003-2006 Gabest

- * (C) 2006-2016 see Authors.txt

+ * (C) 2006-2017 see Authors.txt

  *

  * This file is part of MPC-HC.

  *

@@ -563,6 +563,7 @@ void CFilterMapper2::Init()
                          && Mhook_SetHookEx(&Real_RegSetValueW, Mine_RegSetValueW)

                          && Mhook_SetHookEx(&Real_RegSetValueExA, Mine_RegSetValueExA)

                          && Mhook_SetHookEx(&Real_RegSetValueExW, Mine_RegSetValueExW);

+        s_bInitialized &= MH_EnableHook(MH_ALL_HOOKS) == MH_OK;

     }

 }

 

diff --git a/src/mpc-hc/mplayerc.cpp b/src/mpc-hc/mplayerc.cpp
index 6824e44f8..0a0864885 100644
--- a/src/mpc-hc/mplayerc.cpp
+++ b/src/mpc-hc/mplayerc.cpp
@@ -1466,10 +1466,7 @@ BOOL CMPlayerCApp::InitInstance()
         ASSERT(FALSE);

     }

 

-    // At this point only main thread should be present, mhook is custom-hacked accordingly

-    bool bHookingSuccessful = true;

-

-    MH_Initialize();

+    bool bHookingSuccessful = MH_Initialize() == MH_OK;

 

     bHookingSuccessful &= !!Mhook_SetHookEx(&Real_IsDebuggerPresent, Mine_IsDebuggerPresent);

 

@@ -1487,6 +1484,8 @@ BOOL CMPlayerCApp::InitInstance()
     bHookingSuccessful &= !!Mhook_SetHookEx(&Real_CreateFileW, Mine_CreateFileW);

     bHookingSuccessful &= !!Mhook_SetHookEx(&Real_DeviceIoControl, Mine_DeviceIoControl);

 

+    bHookingSuccessful &= MH_EnableHook(MH_ALL_HOOKS) == MH_OK;

+

     if (!bHookingSuccessful) {

         if (AfxMessageBox(IDS_HOOKS_FAILED, MB_ICONWARNING | MB_YESNO, 0) == IDYES) {

             ShellExecute(nullptr, _T("open"), HOOKS_BUGS_URL, nullptr, nullptr, SW_SHOWDEFAULT);

@@ -1500,6 +1499,8 @@ BOOL CMPlayerCApp::InitInstance()
     VERIFY(Mhook_SetHookEx(&Real_LockWindowUpdate, Mine_LockWindowUpdate));

     VERIFY(Mhook_SetHookEx(&Real_mixerSetControlDetails, Mine_mixerSetControlDetails));

 

+    MH_EnableHook(MH_ALL_HOOKS);

+

     CFilterMapper2::Init();

 

     if (FAILED(OleInitialize(nullptr))) {