Skip to content
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

Replace Detours with MinHook #33

Closed
wants to merge 1 commit into from
Closed

Replace Detours with MinHook #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions DSfix.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E004A114-54E0-B15C-BDA5-46681084E257}.Debug|Win32.ActiveCfg = Debug|Win32
{E004A114-54E0-B15C-BDA5-46681084E257}.Debug|Win32.Build.0 = Debug|Win32
{E004A114-54E0-B15C-BDA5-46681084E257}.Debug|x64.ActiveCfg = Debug|x64
{E004A114-54E0-B15C-BDA5-46681084E257}.Debug|x64.Build.0 = Debug|x64
{E004A114-54E0-B15C-BDA5-46681084E257}.Release|Win32.ActiveCfg = Release|Win32
{E004A114-54E0-B15C-BDA5-46681084E257}.Release|Win32.Build.0 = Release|Win32
{E004A114-54E0-B15C-BDA5-46681084E257}.Release|x64.ActiveCfg = Release|x64
Expand Down
18 changes: 11 additions & 7 deletions DSfix.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
Expand Down Expand Up @@ -75,16 +75,18 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\dev\OculusSDK\LibOVR\Include;C:\dev\Detours Express 3.0\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">E:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;..\minhook\include;$(IncludePath)</IncludePath>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DINPUT8</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">d3d9</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DINPUT8</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">d3d9</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LibraryPath>C:\dev\OculusSDK\LibOVR\Lib\Win32;C:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Lib\x86;C:\dev\Detours Express 3.0\lib.X86;$(LibraryPath)</LibraryPath>
<LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;lib\Debug;$(Configuration);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;..\minhook\include;$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;lib\Debug;$(Configuration);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand Down Expand Up @@ -112,7 +114,7 @@
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>E:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DINPUT8.def</ModuleDefinitionFile>
<AdditionalDependencies>winmm.lib;detours.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>winmm.lib;libMinHook.x86.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
Expand Down Expand Up @@ -187,6 +189,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>DINPUT8.def</ModuleDefinitionFile>
<AdditionalDependencies>winmm.lib;libMinHook.x86.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down Expand Up @@ -346,4 +350,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
93 changes: 56 additions & 37 deletions Detouring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,49 +74,68 @@ HRESULT WINAPI DetouredD3DXCompileShader(_In_ LPCSTR pSrcData, _In_ UINT srcData
return res;
}

void hookFunction(const char* name, const char* dllname, void** ppTarget, void* const pDetour, void** ppOriginal) {
HMODULE dllHandle = GetModuleHandle(dllname);
*ppTarget = GetProcAddress(dllHandle, name);
MH_STATUS ret = MH_CreateHook(*ppTarget, pDetour, ppOriginal);
if (ret == MH_OK) {
SDLOG(2, "MH_CreateHook for %s in %s succeeded\n", name, dllname);
}
else {
SDLOG(0, "MH_CreateHook for %s in %s failed\n", name, dllname);
SDLOG(0, "dllHandle = %p\n", dllHandle);
SDLOG(0, "*ppTarget = %p\n", *ppTarget);
}
ret = MH_EnableHook(*ppTarget);
if (ret == MH_OK) {
SDLOG(2, "MH_EnableHook succeeded\n");
}
else {
SDLOG(0, "MH_EnableHook failed\n");
}
}

namespace {
void* TargetDirect3DCreate9;
void* TargetQueryPerformanceCounter;
void* TargetD3DXCreateTextureFromFileInMemory;
void* TargetD3DXCreateTextureFromFileInMemoryEx;
}

void earlyDetour() {
QueryPerformanceFrequency(&countsPerSec);
DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread());
DetourAttach(&(PVOID&)oDirect3DCreate9, hkDirect3DCreate9);
DetourTransactionCommit();
MH_Initialize();
hookFunction("Direct3DCreate9",
"d3d9.dll",
&TargetDirect3DCreate9,
&hkDirect3DCreate9,
reinterpret_cast<void**>(&oDirect3DCreate9));
}

void startDetour() {
DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread());
//DetourAttach(&(PVOID&)TrueSleepEx, DetouredSleepEx);
//DetourAttach(&(PVOID&)TrueTimeGetTime, DetouredTimeGetTime);
if(Settings::get().getSkipIntro()) DetourAttach(&(PVOID&)TrueQueryPerformanceCounter, DetouredQueryPerformanceCounter);
//TrueD3DXCreateTexture = (D3DXCreateTexture_FNType)DetourFindFunction("d3dx9_43.dll", "D3DXCreateTexture");
TrueD3DXCreateTextureFromFileInMemory = (D3DXCreateTextureFromFileInMemory_FNType)DetourFindFunction("d3dx9_43.dll", "D3DXCreateTextureFromFileInMemory");
TrueD3DXCreateTextureFromFileInMemoryEx = (D3DXCreateTextureFromFileInMemoryEx_FNType)DetourFindFunction("d3dx9_43.dll", "D3DXCreateTextureFromFileInMemoryEx");
//DetourAttach(&(PVOID&)TrueD3DXCreateTexture, DetouredD3DXCreateTexture);
DetourAttach(&(PVOID&)TrueD3DXCreateTextureFromFileInMemory, DetouredD3DXCreateTextureFromFileInMemory);
DetourAttach(&(PVOID&)TrueD3DXCreateTextureFromFileInMemoryEx, DetouredD3DXCreateTextureFromFileInMemoryEx);
//TrueD3DXCompileShader = (D3DXCompileShader_FNType)DetourFindFunction("d3dx9_43.dll", "D3DXCompileShader");
//SDLOG(0, "Detouring: compile shader: %p\n", TrueD3DXCompileShader);
//DetourAttach(&(PVOID&)TrueD3DXCompileShader, DetouredD3DXCompileShader);

if(DetourTransactionCommit() == NO_ERROR) {
SDLOG(0, "Detouring: Detoured successfully\n");
} else {
SDLOG(0, "Detouring: Error detouring\n");
void startDetour() {
if (Settings::get().getSkipIntro()) {
hookFunction("QueryPerformanceCounter",
"kernel32.dll",
&TargetQueryPerformanceCounter,
&DetouredQueryPerformanceCounter,
reinterpret_cast<void**>(&TrueQueryPerformanceCounter));
}
hookFunction("D3DXCreateTextureFromFileInMemory",
"d3dx9_43.dll",
&TargetD3DXCreateTextureFromFileInMemory,
&DetouredD3DXCreateTextureFromFileInMemory,
reinterpret_cast<void**>(&TrueD3DXCreateTextureFromFileInMemory));
hookFunction("D3DXCreateTextureFromFileInMemoryEx",
"d3dx9_43.dll",
&TargetD3DXCreateTextureFromFileInMemoryEx,
&DetouredD3DXCreateTextureFromFileInMemoryEx,
reinterpret_cast<void**>(&TrueD3DXCreateTextureFromFileInMemoryEx));
}

void endDetour() {
//if(Settings::get().getSkipIntro()) {
DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread());
//DetourDetach(&(PVOID&)TrueSleepEx, DetouredSleepEx);
//DetourDetach(&(PVOID&)TrueTimeGetTime, DetouredTimeGetTime);
if(Settings::get().getSkipIntro()) DetourDetach(&(PVOID&)TrueQueryPerformanceCounter, DetouredQueryPerformanceCounter);
//DetourDetach(&(PVOID&)TrueD3DXCreateTexture, DetouredD3DXCreateTexture);
DetourDetach(&(PVOID&)TrueD3DXCreateTextureFromFileInMemory, DetouredD3DXCreateTextureFromFileInMemory);
DetourDetach(&(PVOID&)TrueD3DXCreateTextureFromFileInMemoryEx, DetouredD3DXCreateTextureFromFileInMemoryEx);
DetourDetach(&(PVOID&)oDirect3DCreate9, hkDirect3DCreate9);
//DetourDetach(&(PVOID&)TrueD3DXCompileShader, DetouredD3DXCompileShader);
DetourTransactionCommit();
//}
MH_RemoveHook(TargetDirect3DCreate9);
MH_RemoveHook(TargetQueryPerformanceCounter);
MH_RemoveHook(TargetD3DXCreateTextureFromFileInMemory);
MH_RemoveHook(TargetD3DXCreateTextureFromFileInMemoryEx);
MH_Uninitialize();
}
2 changes: 1 addition & 1 deletion Detouring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "main.h"

#include <detours.h>
#include <MinHook.h>

static DWORD (WINAPI * TrueSleepEx)(DWORD dwMilliseconds, BOOL bAlertable) = SleepEx;

Expand Down