Skip to content

Commit

Permalink
Change dinput8 to version
Browse files Browse the repository at this point in the history
  • Loading branch information
@patrickmollohan
patrickmollohan committed Oct 21, 2024
1 parent 16f81cb commit 36b816a
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 65 deletions.
6 changes: 3 additions & 3 deletions premake5.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ workspace "Ultimate-SWO-ModLoader"
defines {
"rsc_CompanyName=\"Patrick Mollohan\"",
"rsc_LegalCopyright=\"MIT License\"",
"rsc_InternalName=\"%{prj.name}\"", "rsc_ProductName=\"%{prj.name}\"", "rsc_OriginalFilename=\"dinput8.dll\"",
"rsc_InternalName=\"%{prj.name}\"", "rsc_ProductName=\"%{prj.name}\"", "rsc_OriginalFilename=\"version.dll\"",
"rsc_FileDescription=\"Ultimate Star Wars Outlaws ModLoader\"",
"rsc_UpdateUrl=\"https://github.com/patrickmollohan/Ultimate-SWO-ModLoader\""
}
Expand Down Expand Up @@ -50,7 +50,7 @@ project "Ultimate-SWO-ModLoader"
kind "SharedLib"
language "C++"
targetdir "bin/%{cfg.buildcfg}"
targetname "dinput8"
targetname "version"
targetextension ".dll"

includedirs {
Expand All @@ -64,7 +64,7 @@ project "Ultimate-SWO-ModLoader"
"lib/injector/minhook/include/*.h", "lib/injector/minhook/src/**.h", "lib/injector/minhook/src/**.c",
"lib/injector/utility/FunctionHookMinHook.hpp", "lib/injector/utility/FunctionHookMinHook.cpp",
"src/asi_loader.hpp", "src/asi_loader.cpp",
"src/dinput8.def",
"src/version.def",
"src/disk_cache_enabler.hpp", "src/disk_cache_enabler.cpp",
"src/dll_main.hpp", "src/dll_main.cpp",
"src/minhook_handler.hpp", "src/minhook_handler.cpp",
Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is a DLL file based on Ultimate ASI Loader that adds mod support and ASI pl

## INSTALLATION

To install, copy [dinput8.dll](https://github.com/patrickmollohan/Ultimate-SWO-ModLoader/releases/latest/download/dinput8.dll) into the root directory of the game (where "Outlaws.exe" is). This is usually C:\Program Files (x86)\Ubisoft\Ubisoft Game Launcher\games\Star Wars Outlaws
To install, copy [version.dll](https://github.com/patrickmollohan/Ultimate-SWO-ModLoader/releases/latest/download/version.dll) into the root directory of the game (where "Outlaws.exe" is). This is usually C:\Program Files (x86)\Ubisoft\Ubisoft Game Launcher\games\Star Wars Outlaws

## MODDING

Expand Down
113 changes: 61 additions & 52 deletions src/asi_loader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,69 @@ struct shared {
}
} shared;

struct dinput8_dll {
struct version_dll {
HMODULE dll;
FARPROC DirectInput8Create;

void LoadOriginalLibrary(HMODULE module) {
FARPROC GetFileVersionInfoA;
FARPROC GetFileVersionInfoByHandle;
FARPROC GetFileVersionInfoExA;
FARPROC GetFileVersionInfoExW;
FARPROC GetFileVersionInfoSizeA;
FARPROC GetFileVersionInfoSizeExA;
FARPROC GetFileVersionInfoSizeExW;
FARPROC GetFileVersionInfoSizeW;
FARPROC GetFileVersionInfoW;
FARPROC VerFindFileA;
FARPROC VerFindFileW;
FARPROC VerInstallFileA;
FARPROC VerInstallFileW;
FARPROC VerLanguageNameA;
FARPROC VerLanguageNameW;
FARPROC VerQueryValueA;
FARPROC VerQueryValueW;

void LoadOriginalLibrary(HMODULE module)
{
dll = module;
shared.LoadOriginalLibrary(dll);
DirectInput8Create = GetProcAddress(dll, "DirectInput8Create");
GetFileVersionInfoA = GetProcAddress(dll, "GetFileVersionInfoA");
GetFileVersionInfoByHandle = GetProcAddress(dll, "GetFileVersionInfoByHandle");
GetFileVersionInfoExA = GetProcAddress(dll, "GetFileVersionInfoExA");
GetFileVersionInfoExW = GetProcAddress(dll, "GetFileVersionInfoExW");
GetFileVersionInfoSizeA = GetProcAddress(dll, "GetFileVersionInfoSizeA");
GetFileVersionInfoSizeExA = GetProcAddress(dll, "GetFileVersionInfoSizeExA");
GetFileVersionInfoSizeExW = GetProcAddress(dll, "GetFileVersionInfoSizeExW");
GetFileVersionInfoSizeW = GetProcAddress(dll, "GetFileVersionInfoSizeW");
GetFileVersionInfoW = GetProcAddress(dll, "GetFileVersionInfoW");
VerFindFileA = GetProcAddress(dll, "VerFindFileA");
VerFindFileW = GetProcAddress(dll, "VerFindFileW");
VerInstallFileA = GetProcAddress(dll, "VerInstallFileA");
VerInstallFileW = GetProcAddress(dll, "VerInstallFileW");
VerLanguageNameA = GetProcAddress(dll, "VerLanguageNameA");
VerLanguageNameW = GetProcAddress(dll, "VerLanguageNameW");
VerQueryValueA = GetProcAddress(dll, "VerQueryValueA");
VerQueryValueW = GetProcAddress(dll, "VerQueryValueW");
}
} dinput8;
} version;

typedef HRESULT(*fn_DirectInput8Create)(HINSTANCE hinst, DWORD dwVersion, REFIID riidltf, LPVOID * ppvOut, LPUNKNOWN punkOuter);

void _DirectInput8Create() {
(fn_DirectInput8Create)dinput8.DirectInput8Create();
}
void _GetFileVersionInfoA() { version.GetFileVersionInfoA(); }
void _GetFileVersionInfoByHandle() { version.GetFileVersionInfoByHandle(); }
void _GetFileVersionInfoExA() { version.GetFileVersionInfoExA(); }
void _GetFileVersionInfoExW() { version.GetFileVersionInfoExW(); }
void _GetFileVersionInfoSizeA() { version.GetFileVersionInfoSizeA(); }
void _GetFileVersionInfoSizeExA() { version.GetFileVersionInfoSizeExA(); }
void _GetFileVersionInfoSizeExW() { version.GetFileVersionInfoSizeExW(); }
void _GetFileVersionInfoSizeW() { version.GetFileVersionInfoSizeW(); }
void _GetFileVersionInfoW() { version.GetFileVersionInfoW(); }
void _VerFindFileA() { version.VerFindFileA(); }
void _VerFindFileW() { version.VerFindFileW(); }
void _VerInstallFileA() { version.VerInstallFileA(); }
void _VerInstallFileW() { version.VerInstallFileW(); }
void _VerLanguageNameA() { version.VerLanguageNameA(); }
void _VerLanguageNameW() { version.VerLanguageNameW(); }
void _VerQueryValueA() { version.VerQueryValueA(); }
void _VerQueryValueW() { version.VerQueryValueW(); }

void _DllRegisterServer() {
shared.DllRegisterServer();
Expand Down Expand Up @@ -290,11 +337,11 @@ void LoadOriginalLibrary() {
auto szSystemPath = SHGetKnownFolderPath(FOLDERID_System, 0, nullptr) + L'\\' + szSelfName;
auto szLocalPath = GetModuleFileNameW(hm);
szLocalPath = szLocalPath.substr(0, szLocalPath.find_last_of(L"/\\") + 1);
szLocalPath += L"dinput8Hooked.dll";
szLocalPath += L"versionHooked.dll";
if (std::filesystem::exists(szLocalPath)) {
dinput8.LoadOriginalLibrary(LoadLib(szLocalPath));
version.LoadOriginalLibrary(LoadLib(szLocalPath));
} else {
dinput8.LoadOriginalLibrary(LoadLib(szSystemPath));
version.LoadOriginalLibrary(LoadLib(szSystemPath));
}
}

Expand Down Expand Up @@ -510,7 +557,7 @@ HRESULT WINAPI CustomCoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWOR
HRESULT hr = REGDB_E_KEYMISSING;
HMODULE hDll = NULL;

hDll = ::LoadLibrary(L"dinput8.dll");
hDll = ::LoadLibrary(L"version.dll");

if (hDll == NULL || GetProcAddress(hDll, "IsUltimateASILoader") != NULL)
return ::CoCreateInstance(rclsid, pUnkOuter, dwClsContext, riid, ppv);
Expand Down Expand Up @@ -672,7 +719,7 @@ bool HookKernel32IAT(HMODULE mod, bool exe) {
};

auto PatchCoCreateInstance = [&](size_t start, size_t end, size_t exe_end) {
if (iequals(GetSelfName(), L"dinput8.dll")) return;
if (iequals(GetSelfName(), L"version.dll")) return;

for (size_t i = 0; i < nNumImports; i++) {
if (hExecutableInstance + (pImports + i)->FirstThunk > start && !(end && hExecutableInstance + (pImports + i)->FirstThunk > end)) end = hExecutableInstance + (pImports + i)->FirstThunk;
Expand Down Expand Up @@ -736,44 +783,6 @@ bool HookKernel32IAT(HMODULE mod, bool exe) {
}
}

// Fixing ordinals
auto szSelfName = GetSelfName();

static auto PatchOrdinals = [&szSelfName](size_t hInstance) {
IMAGE_NT_HEADERS* ntHeader = (IMAGE_NT_HEADERS*)(hInstance + ((IMAGE_DOS_HEADER*)hInstance)->e_lfanew);
IMAGE_IMPORT_DESCRIPTOR* pImports = (IMAGE_IMPORT_DESCRIPTOR*)(hInstance + ntHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
size_t nNumImports = ntHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size / sizeof(IMAGE_IMPORT_DESCRIPTOR) - 1;

if (nNumImports == (size_t)-1) return;

for (size_t i = 0; i < nNumImports; i++) {
if ((size_t)(hInstance + (pImports + i)->Name) < getSectionEnd(ntHeader, (size_t)hInstance)) {
if (iequals(szSelfName, (to_wstring((const char*)(hInstance + (pImports + i)->Name))))) {
PIMAGE_THUNK_DATA thunk = (PIMAGE_THUNK_DATA)(hInstance + (pImports + i)->OriginalFirstThunk);
size_t j = 0;
while (thunk->u1.Function) {
if (thunk->u1.Ordinal & IMAGE_ORDINAL_FLAG) {
PIMAGE_IMPORT_BY_NAME import = (PIMAGE_IMPORT_BY_NAME)(hInstance + thunk->u1.AddressOfData);
void** p = (void**)(hInstance + (pImports + i)->FirstThunk);
DWORD Protect;
VirtualProtect(&p[j], 4, PAGE_EXECUTE_READWRITE, &Protect);

if ((IMAGE_ORDINAL(thunk->u1.Ordinal)) == 1) p[j] = _DirectInput8Create;
++j;
}
++thunk;
}
break;
}
}
}
};

ModuleList dlls;
dlls.Enumerate(ModuleList::SearchLocation::LocalOnly);
for (auto& e : dlls.m_moduleList) {
PatchOrdinals((size_t)std::get<HMODULE>(e));
}
return matchedImports > 0;
}

Expand Down
9 changes: 0 additions & 9 deletions src/dinput8.def
View file

This file was deleted.

19 changes: 19 additions & 0 deletions src/version.def
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
LIBRARY "version"
EXPORTS
GetFileVersionInfoA = _GetFileVersionInfoA
GetFileVersionInfoByHandle = _GetFileVersionInfoByHandle
GetFileVersionInfoExA = _GetFileVersionInfoExA
GetFileVersionInfoExW = _GetFileVersionInfoExW
GetFileVersionInfoSizeA = _GetFileVersionInfoSizeA
GetFileVersionInfoSizeExA = _GetFileVersionInfoSizeExA
GetFileVersionInfoSizeExW = _GetFileVersionInfoSizeExW
GetFileVersionInfoSizeW = _GetFileVersionInfoSizeW
GetFileVersionInfoW = _GetFileVersionInfoW
VerFindFileA = _VerFindFileA
VerFindFileW = _VerFindFileW
VerInstallFileA = _VerInstallFileA
VerInstallFileW = _VerInstallFileW
VerLanguageNameA = _VerLanguageNameA
VerLanguageNameW = _VerLanguageNameW
VerQueryValueA = _VerQueryValueA
VerQueryValueW = _VerQueryValueW

0 comments on commit 36b816a

Please sign in to comment.