From c3b61514eeaebe0d6e592437081f10d2f757cba1 Mon Sep 17 00:00:00 2001 From: Emma Miler Date: Sun, 25 Sep 2022 01:36:41 +0200 Subject: Replace XInput library with updated one (#278) * Replace XInput library with updated one This code adds better compatibility with newer controllers and different controller types Also adds ASLR to the loaded library * Formatting --- NorthstarDLL/hooks.cpp | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'NorthstarDLL') diff --git a/NorthstarDLL/hooks.cpp b/NorthstarDLL/hooks.cpp index 7f1d3b84..72ae727a 100644 --- a/NorthstarDLL/hooks.cpp +++ b/NorthstarDLL/hooks.cpp @@ -210,14 +210,29 @@ void CallAllPendingDLLLoadCallbacks() HMODULE LoadLibraryExAHook(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags) { - HMODULE moduleAddress = LoadLibraryExAOriginal(lpLibFileName, hFile, dwFlags); - - if (moduleAddress) + if (!strncmp(lpLibFileName, "XInput1_3.dll", 14)) { - CallLoadLibraryACallbacks(lpLibFileName, moduleAddress); + HMODULE moduleAddress = LoadLibraryExAOriginal("XInput9_1_0.dll", hFile, dwFlags); + if (moduleAddress) + { + CallLoadLibraryACallbacks(lpLibFileName, moduleAddress); + } + else + { + MessageBoxA(0, "Could not find XInput9_1_0.dll", "Northstar", MB_ICONERROR); + exit(-1); + } + return moduleAddress; + } + else + { + HMODULE moduleAddress = LoadLibraryExAOriginal(lpLibFileName, hFile, dwFlags); + if (moduleAddress) + { + CallLoadLibraryACallbacks(lpLibFileName, moduleAddress); + } + return moduleAddress; } - - return moduleAddress; } HMODULE LoadLibraryAHook(LPCSTR lpLibFileName) -- cgit v1.2.3