backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Removed DirectInputCreateA hook

Browse Source
This commit is contained in:
narzoul 2020-04-11 18:16:46 +02:00
parent 4eb28cc596
commit 32bcf16dc8
3 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DDrawCompat/Dll/DDrawCompat.def
View File

@ -23,4 +23,3 @@ EXPORTS
RegisterSpecialCase RegisterSpecialCase
ReleaseDDThreadLock ReleaseDDThreadLock
SetAppCompatData SetAppCompatData
DirectInputCreateA

46
DDrawCompat/Dll/DllMain.cpp
View File

@ -4,29 +4,26 @@
#include <timeapi.h> #include <timeapi.h>
#include <Uxtheme.h> #include <Uxtheme.h>
#include "Common/Hook.h" #include <Common/Hook.h>
#include "Common/Log.h" #include <Common/Log.h>
#include "Common/Time.h" #include <Common/Time.h>
#include "D3dDdi/Hooks.h" #include <D3dDdi/Hooks.h>
#include "DDraw/DirectDraw.h" #include <DDraw/DirectDraw.h>
#include "DDraw/Hooks.h" #include <DDraw/Hooks.h>
#include "Direct3d/Hooks.h" #include <Direct3d/Hooks.h>
#include "Dll/Procs.h" #include <Dll/Procs.h>
#include "Gdi/Gdi.h" #include <Gdi/Gdi.h>
#include "Gdi/VirtualScreen.h" #include <Gdi/VirtualScreen.h>
#include "Win32/DisplayMode.h" #include <Win32/DisplayMode.h>
#include "Win32/FontSmoothing.h" #include <Win32/FontSmoothing.h>
#include "Win32/MsgHooks.h" #include <Win32/MsgHooks.h>
#include "Win32/Registry.h" #include <Win32/Registry.h>
struct IDirectInput;
HRESULT WINAPI SetAppCompatData(DWORD, DWORD); HRESULT WINAPI SetAppCompatData(DWORD, DWORD);
namespace namespace
{ {
HMODULE g_origDDrawModule = nullptr; HMODULE g_origDDrawModule = nullptr;
HMODULE g_origDInputModule = nullptr;
void installHooks() void installHooks()
{ {
@ -130,14 +127,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
return FALSE; return FALSE;
} }
if (!loadLibrary(systemDirectory, "ddraw.dll", g_origDDrawModule) || if (!loadLibrary(systemDirectory, "ddraw.dll", g_origDDrawModule))
!loadLibrary(systemDirectory, "dinput.dll", g_origDInputModule))
{ {
return FALSE; return FALSE;
} }
VISIT_ALL_PROCS(LOAD_ORIGINAL_PROC); VISIT_ALL_PROCS(LOAD_ORIGINAL_PROC);
Dll::g_origProcs.DirectInputCreateA = GetProcAddress(g_origDInputModule, "DirectInputCreateA");
const BOOL disablePriorityBoost = TRUE; const BOOL disablePriorityBoost = TRUE;
SetProcessPriorityBoost(GetCurrentProcess(), disablePriorityBoost); SetProcessPriorityBoost(GetCurrentProcess(), disablePriorityBoost);
@ -167,7 +162,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
D3dDdi::uninstallHooks(); D3dDdi::uninstallHooks();
Gdi::uninstallHooks(); Gdi::uninstallHooks();
Compat::unhookAllFunctions(); Compat::unhookAllFunctions();
FreeLibrary(g_origDInputModule);
FreeLibrary(g_origDDrawModule); FreeLibrary(g_origDDrawModule);
} }
Win32::FontSmoothing::setSystemSettingsForced(Win32::FontSmoothing::g_origSystemSettings); Win32::FontSmoothing::setSystemSettingsForced(Win32::FontSmoothing::g_origSystemSettings);
@ -205,16 +199,6 @@ extern "C" HRESULT WINAPI DirectDrawCreateEx(
return LOG_RESULT(CALL_ORIG_PROC(DirectDrawCreateEx)(lpGUID, lplpDD, iid, pUnkOuter)); return LOG_RESULT(CALL_ORIG_PROC(DirectDrawCreateEx)(lpGUID, lplpDD, iid, pUnkOuter));
} }
extern "C" HRESULT WINAPI DirectInputCreateA(
HINSTANCE hinst,
DWORD dwVersion,
IDirectInput** lplpDirectInput,
LPUNKNOWN punkOuter)
{
LOG_FUNC(__func__, hinst, dwVersion, lplpDirectInput, punkOuter);
return LOG_RESULT(CALL_ORIG_PROC(DirectInputCreateA)(hinst, dwVersion, lplpDirectInput, punkOuter));
}
extern "C" HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) extern "C" HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
{ {
LOG_FUNC(__func__, rclsid, riid, ppv); LOG_FUNC(__func__, rclsid, riid, ppv);

1
DDrawCompat/Dll/Procs.h
View File

@ -39,7 +39,6 @@ namespace Dll
struct Procs struct Procs
{ {
VISIT_ALL_PROCS(ADD_FARPROC_MEMBER); VISIT_ALL_PROCS(ADD_FARPROC_MEMBER);
FARPROC DirectInputCreateA;
}; };
extern Procs g_origProcs; extern Procs g_origProcs;